Use relative path in git mv for cubids apply with --use-datalad
#348
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tsalo
reviewed
Jan 16, 2025
| @@ -410,7 +410,9 @@ def apply_tsv_changes(self, summary_tsv, files_tsv, new_prefix, raise_on_error=T | |||
| if Path(from_file).exists(): | |||
| # if using datalad, we want to git mv instead of mv | |||
| if self.use_datalad: | |||
| move_ops.append(f"git mv {from_file} {to_file}") | |||
| move_ops.append( | |||
| f"git mv {os.path.relpath(from_file, str(self.path))} {to_file}" | |||
There was a problem hiding this comment.
relpath fails if from_file isn't in self.path, right? Is that worth checking explicitly beforehand?
There was a problem hiding this comment.
I realized in retrospect that my git version was kind of old when I first tested, I might revisit this PR again after the hackathon to see if it's necessary.
There was a problem hiding this comment.
And yes that would fail, but I'm not sure if that fail mode would actually ever occur.
There was a problem hiding this comment.
Oh okay cool. I assumed this was a low-hanging fruit that we'd accidentally skipped over, but I'll hold off on reviewing until you've had a chance to circle back to it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes none, but allows
cubids applyto run with datalad.